Merge remote-tracking branch 'origin/master' into feature/android

author Po Lu <luangruo@yahoo.com>

Sat, 29 Jul 2023 03:29:42 +0000 (11:29 +0800)

committer Po Lu <luangruo@yahoo.com>

Sat, 29 Jul 2023 03:29:42 +0000 (11:29 +0800)
author Po Lu <luangruo@yahoo.com>
Sat, 29 Jul 2023 03:29:42 +0000 (11:29 +0800)
committer Po Lu <luangruo@yahoo.com>
Sat, 29 Jul 2023 03:29:42 +0000 (11:29 +0800)
diff --cc lisp/bindings.el
Simple merge
diff --cc lisp/doc-view.el
Simple merge
author	Po Lu <luangruo@yahoo.com>
	Sat, 29 Jul 2023 03:29:42 +0000 (11:29 +0800)
committer	Po Lu <luangruo@yahoo.com>
	Sat, 29 Jul 2023 03:29:42 +0000 (11:29 +0800)
		1	2
lisp/bindings.el	patch \|	diff1 \|	diff2 \|	blob \| history
lisp/doc-view.el	patch \|	diff1 \|	diff2 \|	blob \| history